more bugfixes to fix UNIVERSAL->import reference