Fix two issues with activating editors and saving models.

Change-Id: Ie19750d9a4161c9a0f98e82ec3c8b067c9017263