SW-148. Fixing some small issues