Robins corrections and making the chapter build-able again