Improve compatibility w/ official library#2

tstromberg merged 2 commits intocodeGROOVE-dev:maincodeGROOVE-dev/ds9:mainfrom

tstromberg:maintstromberg/ds9:mainCopy head branch name to clipboard