Fix some null refs.