Fix some findbugs/IDEA inspection warnings