A couple of changes

A few changes