fix up bugs from merge cruft