Tweaks to Stub JS