Some more ext assn work
Fix merge