Some minor changes after regression testing