try to get export/visibility and build conditionals right for surfaces/, once more