Fixes issue 3543 Fixes issue 3545 Change-Id: I71426cf26a029c2886c33a3c0698698031c0df95 Reviewed-on: http://gerrit.dmdirc.com/538 Automatic-Compile: Chris Smith <chris@dmdirc.com> Reviewed-by: Chris Smith <chris@dmdirc.com>