Fixes for new layouts