Translation improvments