Minor changes learned from production app
Minor changes