Further improvements for #6