[V6r11] various

Various fixes...