Minor bugfixes
Merge pull request #272 from mhwest13/master

Bugfixes...