Fix static anyalisis errors
Fix conflicts + some others static analysis errors