Bug 1014418 - Address review comments