[v6r10] Fixes here and there for v6r10

Few real bugs, few just pylint fixes