Bug 907652 - Some review comments fixed