Merge "Fixing constructors to match header files"