Eluna Fix static analysis noted warnings and errors