Fixes issue 4134 Fixes issue 4135 Fixes issue 4133 Change-Id: Iddd21293b8adbc004a04a25da9c4cad57cb6c168 Reviewed-on: http://gerrit.dmdirc.com/1241 Reviewed-by: Gregory Holmes <greg@dmdirc.com> Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>