various fixes for tasks