Various fixes

Brady, I made a small fix and I just wanted to try out making a pull request in Github.