Fixed some clashes