Insert some missing checks in ability activation