Remove --first-parent.  I think it should work fine without it
Minor improvements to server