Fix save errors