Fix some namespace clashes