Merge missing fixes