JavaScript Fixes