Changes to allow usage of block zero