Fixes issue 3975
Fixes issue 3947
Fixes issue 3946
Fixes issue 3928

Change-Id: If4d35bde4230243e541bf73cc68dbda0f7382b92
Reviewed-on: http://gerrit.dmdirc.com/1039
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

Same code == same hitboxes == impossible (I can't reproduce so can't test)

Change-Id: Ieb5ab99668777389b861aa158aee87bada7783a0
Reviewed-on: http://gerrit.dmdirc.com/1032
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>