Fixes bugs in JSO and DOM