some fixes for trigger skills