Fix the medium severiry issues