Section fixes - untested.