fix some tasks