A couple of minor fixes