Fixed path problems, and better handling no setting.