Fixes for compatibility limit_section_entries