Form language fixes