Fixed some consistency issues in file-tree