Small changes, add missing files from master, fix warnings