Some Fixes for Regression Test :)