improve/fix IP assignments