Latest fixes from parent repo