Minor fixes that were pull requests on the main repo.