SW-74. Minor fixes