Fix error in info blocks and layer lookup