Small fixes + load env indicator by default when using deploy.