Resume fixes in pre-configure and initial build stage