Fix building && fix AwesomeConstants

Change-Id: I4741e4744079c542185baab9e2ce40845d2881ba
We also need this one

Change-Id: If6de36498a67eb189ecb0cc2879109b01909a6c5