Fix some build inconsistencies.