diff --git a/lib/daemon.py b/lib/daemon.py
index 2027a4b31bd906536699bc06f64ca51566d3330b..304b527053b6af4283c3a748fa17aa3027160f82 100644
--- a/lib/daemon.py
+++ b/lib/daemon.py
@@ -551,7 +551,7 @@ def GenericMain(daemon_name, optionparser, dirs, check_fn, exec_fn,
                           choices=["no", "yes", "only"])
 
   if daemon_name in constants.DAEMONS_PORTS:
-    default_bind_address = "0.0.0.0"
+    default_bind_address = constants.IP4_ADDRESS_ANY
     default_port = utils.GetDaemonPort(daemon_name)
 
     # For networked daemons we allow choosing the port and bind address
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index 81499b58412ae9dc3101d43b591141c7babb1568..67d83cca2e6c48de6185df89ac344bf3464123d7 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -517,7 +517,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
       if utils.IsValidIP(vnc_bind_address):
         if instance.network_port > constants.VNC_BASE_PORT:
           display = instance.network_port - constants.VNC_BASE_PORT
-          if vnc_bind_address == '0.0.0.0':
+          if vnc_bind_address == constants.IP4_ADDRESS_ANY:
             vnc_arg = ':%d' % (display)
           else:
             vnc_arg = '%s:%d' % (vnc_bind_address, display)