JS Bug fixes, some temporary.