Fixes for Js and Alerts