Fix first/lastname missing from schema