Hardcoded blocks patch

A few hard-coded block indices that should use introspection.