Various bugfixes (2)

Lars Willighagen requested to merge phoenix/bugfix/various-2 into phoenix/develop Mar 12, 2024