wip siren and resource fixes