Fixes for FRLayout and WalshawLayout