Fixes to ScholarTool to run under Mac