Fixing auto-imports and compilation errors.