Fixing code static analysis