Fixed review comments for bug 876043