Fixes imports (were broken by last commit)