Make the chown's a bit smarter.