fixed some small import bugs