More fixes, more translations