Fixed some globals