merge fixes from master