Fix: some more 'this' issues