various height fixes