Fix some issues with source strings, spotted by szyk