minor fixes/improvements for #489