more class loading fixes