Fix errors. Constructors accept Firm as argument.