Fix scrutiniser errors