forwarder script fixes