More things to fix stupid null reference lists