Fixes on taskever