updated fixes