Update synonym library with a couple bugs