Code review: 167050043:  Various fixes