Merge pull request #505 from jonohart/fw

Forwarding bug fixes