Fixes for layout after mega-merge