FindBugs fixes
Relicense under LGPL+EPL.