It appears Ubuntu 16.10 escaped my testing ¯\_(ツ)_/¯ The changes are pretty much just me being picky but hey ho