Prep for custom alarm workaround