Fixing more directories