Fix pickle and json shortcuts