Fix environment defaults