Fix a few findbugs warnings

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>