Some more tweaks and translations