WIP: Clean up some findbugs warnings