Fix vendor methods + interpolated strings, closes #34