Updates after changes from code review and regression testing.