Fixes from Insight and Scrut