Fix for transport option and monkey patching

Change-Id: I3784a5ef7495eb94f60cd9471261ecbf7a8afb3d