Minor bug fixes from Robbie Brook

I committed these to the wrong branch...they should have been put on
master....still don't understand branching completely :(