Mostly class loading fixing?