Improve the way how default paths are fixed.