#799 - minor fixes