Problems with scope resolution in new / imported files

Issues tend to get resolved after a restart, but this shouldn't really be required every time a new file is imported.