Little chamges in default checker