Environment Fixes