Misc. corrections, removed last remnant of old load rules