Final fixes for delombok demo!