Small reference fixes and addition of select block for easy placement in the block layout