Save record fixes