more optimizations

Change-Id: I5069a2d13433365a99987d32e78ead0e3297ac9a
Signed-off-by: Eyal Salomon <esalomon@mellanox.com>