minor fixes for previous commit