more small fixes to #62