Small fixes in BlockMap.