Clean up haproxy and fix S10 build