Fix build + Add missing files