minor fixes found during automated testing