More scrutiniser fixes