Fixed nullable fields