partial fixes for layout tests