Minor modifications on the singularity check module