Ability handler fixes