Fix load and save after distilling out callable methods