Warnings removed, small fixes to enroll