Minor findbugs cleanups