Rough tweaks. #1684