Fixes and missing utils for chapter 11