some no-new fixes and cleanup #1660