Fix conditions for data path creation. Supresses warning