Updates after Handle/Constrainable merge