HAProxy Container + Small Fixes