misc fixes

rebased version of https://github.com/FlowForwarding/of_protocol/pull/17