More mistakes to be fixed