Few more checks