Bugfixes for haproxy refactoring