Fix some null stuff