Merge fixes from master