Note two more bug fixes

Change-Id: Ie593251085f03728c33c15c5f95bbbc7fd0c174b