-I'm slightly less of an idiot.
Merge pull request #1054 from mmcguinn/fixes

-I'm slightly less of an idiot.