couple of fixes for height issues