Fix data join order and scale update (#141).