- Fixed some ClassNotFound Exceptions