More Eigen allignment fixes