LPS-35835 Fix some import issues

@juliocamarero