Add more checks to EnvPlugin, add -1 mode