Fixes from Nadav