Fixes for 24.3.