Fixed more of jer's imports