Adjusted skipif sections