Fixed Shlomi errors

Fixed Shlomi errors