Fix staging issues.