Fixed all defines