Changed some defines