Some tweaks to pulpv2 code