Fix some references to null-ed out data