Fixed nonsense due to my ignorance of git rebase etc