Fixed a couple issues that came up when I forgot to branch before.