Fix warnings (and missing files)