Minor errors from port from StarPractice