Few height fixes