Simple fixes for shared environment use