Fixed errors with Mentor