Build proc improvements