Occupation 2.5: Update 17.08.2022

Bug fixes