A couple bugfixes related to instructor defined tools