Regression bugs fixed