Fix and silence import issues