Dockblocks fixes