Fix some misc class loading problems