minor fixes relating to imports that, for some unknown reason, were not apparent during testing