Fixed issues with templated string-literals