Dev-480. some fixes.