Fixes from comments for TM Reports