Fixed some VM-unsafe Hashtables (eliminated all warnings of the source project's code - consider pulling this)