master: 0fb82ebc8f818237a89f208cf72ea0e6b3873035 More minor fixes