Added a few fixes to get haproxy working