fixed globals.h warnings
Undid changing core
Merge pull request #717 from worktycho/warningfixes

fixed globals.h warnings