More findbugs fixes done.