Too many fixes