Fix solar generation
A few fixes