Record fixes
More record fixes