Fix for some more null stuff in the live tables