Fixes bugs in webcore