Fix DAO constructors