Fix some more null references