+ further gii fixes