A couple minor fixes