Fix db dump chater 5 + initial code chapter 6