Issue fixes for #65 and #64