Fixes string not been cloned in some places
Merge branch 'compiler'