Changed tasks to fix some bugs