#261 improvements.