Fixed multiple issues stemming from the incomplete changes to both sunra utils and the changes to the event code