merge fixes from experiments