Some minor changes to pass lint