Fixes and updates to CV