Fixes on new JQuery way