Fixes to the update system and the master template.