Merge fixes from main