Local changes to match my environment