fixes by @3rdBardo for #67 and #62