Adding multiple fixes to get the confirmation system working.