Some minor changes that had been bothering me.