Some small post cleanups

Change-Id: I78e82be3c657de039b8e805a239f7926cd1bd2ce