Bug 1050638 - fix nits which got missed out in initial commit