Fixed symbol overriding issues on remote shell