Task1Click fixes