More fixes and translations