Misc changes (hit it til it works) so I can deploy with Jeweler