fixes re: @mb's comments