Fixes and translations