More JS HInt Fixes