Fixed project-wide import cockup