Various fixes
Merge branch 'master' of https://github.com/hen31/P4P-Vliegbagage