Record fixes