Add forgotten files
Fix some issues because of merge