Revert some changes for stability
fix typo in block makefile