merge fixes from hmaon