SCrutiniser fixes