Fixing issues for the latest gulp version