CMO and paramedic access tweaks cherry-pick