Fixing tasks (still WIP...)