Modify return values of L2 bridge API handlers