Couple more checks