fix minor issues from previous commit