Bug-fix: Bug list after static analysis check.