Minor fixes for No COnflict