Add a couple more checks for completeness