Further stringification fixes