SW-148. Fixing small things