several fixes for example 04_model