Further FindBugs fixes
Address masked fields FindBugs warning