Fixed some issues caused by continued development of the scenery-phet repo.