Skip logic fixes