Scrutiniser fixes