Some fixes to the most recent updates.