Fixed stuff in order to run properly the 5-minute tutorial