Couple of minor fixes so that tests run.