pack of fixes by barak