Some more tiny language tweaks