Fix a bunch of stuff from findbugs