fix a few null pointers