Scope fixes, type auto completion.