More fixes.

Change-Id: Ie9ce5e3ee199e93ee786912e6593a6b597d9e403
Reviewed-on: http://gerrit.dmdirc.com/3565
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>