Solve some issues