Fix skipifs & update titles