Changed BasicClientBlock and DirtClientBlock to reflect last commit.