Minor improvements for translatable strings