Two semantic fixes