Tweaks to some folder output variables