fixing some nulls