Fix small issues to improve software stability