Fix: fix a lot of scrutiniser errors