Apply fixes based on feedback from Christina and DB.