fix two skills related bugs