Regarrangement and regression fixes