Code review: 163580043:  Fixes for issue 9.