Fix TaskBoard bugs