fix some null variables