Fix small issues

Some of them are really annoying, especially when using translation tools which are explicitly based on regex.