Minor semantic fixes.