Fixed vfp issues