Some fixes to confirm data.