rygorous Post-merge fixes