alarm/v8 fixes