R4: Two small language fixes