Fixed some thangs.
Merge branch 'core'