Fire wall forward (misc patches)