Add a Todo to do and fix some warnings (FileService)
Merge origin/master