Merged review fixes for https://www.pivotaltracker.com/story/show/51213657

Signed-off-by: IUnknown68 <arne@salsitasoft.com>