Fixes broken imports