Bug 920270 - Address review comments