A few more height fixes.