Introduce more comparison checks, close #1078
Minor clean up