Remove Jquery1 and fix two very small issues