Add default broadcast address
Fix retries on properties