June14: Fixed few coverity issues reported

Signed-off-by: Daan Hoogland <daan@onecht.net>