Flare / Sun tweaks