small fixes from Shira