Build system fixes.