Build system tweaks