More fixes for Folder