more 1.7 update work (no build errors, launches!)