Check a lost stuff and fix the build