fix imports and warnings