More chaining fixes