Fixed scrutiniser issues