Minor tweaks to make it play nice with my environment