Fixes, duelling knives.

See commit history, nothing large or remarkable to note.