oxfw: code modification according to preparation for upstream