Fixes for multiple folders