Fixes issue 3168
Fixes issue 3347

Change-Id: I7722fe396e58f37cc60d10f54bb3a68ab63dbe7b
Reviewed-on: http://gerrit.dmdirc.com/358
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

Change-Id: Ie8fe55536d320ab50472d8090b63c701cc4b12ba
Reviewed-on: http://gerrit.dmdirc.com/230
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Shane Mc Cormack <shane@dmdirc.com>