fix unsupported constructs