Complete: 13.12.2023

Minor bug fixes