Second pass language tweak