Small fixes
Small  fixes
Fixed to compile

Signed-off-by: David Silver <dms.silver@gmail.com>