Fix bugs after folder changes.