Fixing some issues with @import