Fix problems from prior merge