skips and fixes