Fixed several NPEs from more minimal records