Fine tuning build dependencies