small import fixes