Fixed up some null issues