Some small changes to the CV Building Handler