Updated more places to use proper IP