octopi-git: More fixes, working to a reasonable extent