Bug000 bugfixes

Merge fixes into FTR002_Reports