Handle constructors fixup