A couple modifications

Kelly -

I made a couple modifications that I was hoping to get into master.