Fixes for DOM