Minor tweaks on folder and proxy