Dodgy diff

Misc small changes