some semantic fixes