Fix library dependency conflicts