Fixes from @yahoe.001 on transifex