Fix some translation issuesand other minor fixes
Authored by: arcachofo 2018-07-23
Parent: [r413]
Child: [r415]