mentor fixes