Improvements to #87