Fixed import bugs