Code review changes from Ned+Cale