Some minor cleanups

I have some commits that makes findbugs little happier...