Fix some compiler errors after re-arranging blocktype locations