Some FindBugs fixes - some inner classes made as static