Fix up bugs caused by git reversing