Changed a few small oversights

Prior commit would not work without the config changes posted here.