Fix issues before deploy