Fixing up some environment differences