Fix wrong reference to blk_map, cleanups