Fix small issues and improve software stability