Changed some #defines to static const