Some minor changes while I work on fixing things