Idea and FindBugs suggested fixes

Hi there!
Was poking at Kairosdb internals and could help pleasing IDEA and FindBugs in some pretty obvious suggestions.