Fix small issues
Fix small issues