Avoid various conflicts