Bug 905629 - review fixes