Make sure the bytecode block name is available, minor cf fixes and tests