Trying to fix bugs in gitfight