Some fixes for task (files)