Chapter-03 fixes