Fix a few buggies.
Merge branch 'master' of github.com:asmedrano/PVD-FTF