Fixes to #81