Add missing options, reset environments