Fixes to handling of section name