City fixes