Fix bad habits from different languages