Remove useless fallback case

My bad ;-)
Some fixes
Merge pull request #1012 from franckstauffer/master

Some small fixes