Fix handling of additional params in env* methods