Various fixes
Add missing files