A minor patch to fix a few small bugs users have encountered.