Fixed IP related issues