More fixes for covering types of jQuery scenarios