Fixes and add missing files