Comparation fixes in some function in base module.