Bug Fixes

Thanks to James for pointing these out for me. One more coming up soon
before the day is over.