Made bug fixes to make mcquains tests happy