Save Fixes (not really)