Fixed some packages and symbols based
Merge- no conflicts.