Chord Library fixes