Partial fixes before deploy.