So many fixes