Fixes to building from source sections (incomplete)