Tweaks after the fact

Change-Id: Id96203de023b3b8bde1984a61c41dd9bc1711de4