Improvements for #25