Number of fixes including clipDate check