Some additional minor validation