Minor fixes for No Conflict