A few small bug fixes. Refs #393