some fixes
Merge pull request #140 from shtyftu/odklFixes

Some fixes for XHR.