Correct some issues based on github comments.