Fix up the build so this works on CM
Can change later on for gummy - for the time being we work on CM :)
thx papi