[V6r11] various

Just VERY minor fixes...