tweak tweak fix constructors

Change-Id: I9b3c53ea0aa51381f902ba3ff8793d8673373a3f