Some build dependency tweaks.