Fixed other enviroment issues, tested in SMP