Fix socket heights
Merge