Fix static analysis