Fix abilities spec and something else