[v6r11] Just few fixes

minor things