Add a couple minor tweakks
Changing back some things that shouldn't have been changed.