Uncomment some checks