Some small changes based on pull requests