-I'm an idiot.
Merge pull request #1053 from mmcguinn/fixes

-I'm an idiot.