Add right variable prefixes, and fix get_env_variable so it works when the default is False. Doh