fixes after Shlomi