regression and test fixes for 0.4.1