Fixes for form height issues