[v6r12] More fixes for v6r12...