Fixes from Avital