Fix JS errors
Fix JS errors