No rsync, and tweaks