Fix small issues 1.7
Fix small issues 1.7