Improve isolation of SDK intermediates