Skip fixes