Fixing up things from the changes to the block