Follow-up commit. Fix imports to not use wildcards