Bugfixes

In this pull request, I fixed bugs fdo#63728 and fdo#60584.