Fixed some class loading difficulties