Fixed a couple of errors arising from changes made to standard CDS PV calculator