Various findbugs parsing related fixes