minor fixes for previous commit with mistakes