bug fixes to make port forwarding work properly

Signed-off-by: rauldeve <rahul.e.dev@gmail.com>