Fixed some issues that there was in the block file