#4: Making the build working again...