VectorX hotfixes