Some changes for translations-sake