Small changes to prepare the code for the Workshop