Extended several fixes for non-required dob to phones as well.