Changes to accomodate an avocet dev environment