Sun, Moon wrong position and size

Hello !

I would be interested in fixing wrong Postion and Size of sun ,moon axis and SUN size .

Is there a fast solution to fix this because the terrain is not the middle point between sun and moon, 

and sun is too small? or Do I have to always manually set up these things (annoying) 

before 2.0 there was not this problem.

Thank you,