Fix: More scrutiniser fixes