Changes for chapter 11 for port to CanaryMod