Some additional checks