Hot fixes on folders