some minor improvements for #69