Fixed imports and compile errors for merge