maor fixes