Security warning fix + translation braking fix