Fixed some validation as well as path names.