fix a few mentors bugs