Fix some solevip bugs.