Fixed some issues with having no x-ip