fixes to sun