Make some final int's static

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Fix a possible NPE

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
Fix 2 possible NPEs

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