Misc. Bug Fixes

Another super descriptive update. Yep, just another batch of minor bug
fixes.