review post: Commit random improvements

Adding some random improvements implemented during SF-42. The issue
itself was in the end rejected and not implemented.

Story-Id: SF-42
Change-Id: 776002d72c