Fix some gem dependency conflicts