A couple minor changes