Corrected import problems