Fixed some compile bugs - A few still remaining

unordered_set causing problems
Some pointer errors