Small Fixes

Signed-off-by: Itai Koren <itkoren@gmail.com>