Fixes for chapter2, upgraded dependencies