Some enhancements for #72