Some fixes on taskboard