JS Fallback Fixes