Fix record constructors