Fixed even more constructor bugs