Fixed a few Block classes