Use the platform independent types
Merge branch 'savefile'