LUN-600 -- small fixes