4edeb17 Fixes cross save problems due to architecture differences