Fixed most compatability issues with PSV