Fix jQuery related issues