Fixing wrong imports and wrong builds