Started on CanaryChunk fixing