Update sources to comply with FindBugs rules