Update for the system and add new fixes.