Some additional checks addded