Introduced several fixes in order to get the example, used in the demo
at the third meeting with the Company, to work.