another quick fix

I didn't get a chance to fix up forwarding rules, but looks like a few little tweaks needed to get it working.