environmental fixes