Fix pickle imports