Fix alarm and availability