Necessary changes to correct problem fileserving from environments