fix issues caused when merging a couple pull requests