Patch from Ben Dooks

remove a number of warnings from the default shark
build

Signed-off-by: Ben Dooks
Signed-off-by: Russell King