Final the couple of things.

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