Fix some provides/conflicts for cleaner install.