Fixes for folders