Unify some things