Smaller fixes for conflict and error messages