Fix vars & symbol resolution