Severail fixes
Severail fixes