Fix dev clashes