Fix small issues 1.7