Fixed sunflare issues