Some bug fixes

Just fixed a couple of bugs.  Mostly typos.
no message