More alarm work, Fixes for Intellisense errors