Bugfixes, Various

fixes #4577
fixes #4375
fixes #4601
fixes #4583