More fixups after constructor change. Should be good now!