ah i get it now .. not sure i understand the places you marked as hack. if i get things right .. then these hacks only affect the server command? i guess it would be ideal if the env would be determined when calling the server command .. which you seem to be handling, so i am not sure why this hack here is also necessary