Corrected import bugs