build : fixes w/new setup mechanism