Fix small issues and improve code
Fix issue for wraped synchronized argument