more constructor fixes