Fixed builds cleanup.