Fix some problematic imports