Fix block registrations while still practical