More ability fixes