Fix more issues with section IDs