Some fixes based on translation attempts