Fix for ClassNotFound errors