Cvx implementation improvements