Avoid some still left build warnings
reduce the number of files
Copy from master fixes for warning