Fix some tasks