Couple of bug fixes to file browswer