Fixes after regression testing
Some changes after regression testing