Small fixies, reorder blocks