Hopefully fixed dependency clashes