Fix webkit related errors