Fix tasks