Fixes from Freenode user JoeBell

These are a few of the changes Freenode user JoeBell suggested yesterday.