Fixes in glue_pickle