Minor changes after regression testing