47 Task Empty + other fixes