Fix BlockFunctions