Add some fixes. Wait for maayan fix.