Change some defines to static const