Solve some errors