Work to fix issues discovered in #53