Multiple fixes.  Include some small design chagnes.