More fixes found with testsuites + merge of bug-analysis tool