Fix bugs in old Blocks