Minor improvements for #342