additional set of fbugs fixes / excludes