sunrise fixes